4.2 dev - Merge latest changes from 4.2-dev to master