Merge branch 'release/1.2.17' into develop
Manifest storage added.
Bump
Merge branch 'release/1.2.18'