moved changes from 1.7.2 to master