1.7 permanent move
Preparing to merge with master