Sync submodule
Merge branch 'refs/heads/custom-1.6.0' into develop