Committing 2.7.4 to master