compile
version 1.6.0
Merge branch 'release/1.6.0' into develop