squash merging generic branch into master