Pushing the start of changes for 1.7.7
Merge branch 'feature/1.7.7' into develop