Cumulative updates on dev fork

This is test of the workflow for merging a fork with cumulative changes on 4.2 and to be pushed to official 4.2 branch.