Bump Version
Merge branch 'release/v1.3.6-constellation' into develop