merge master 1.7.4 into working branch