merge working copy of 7.4