CURRENT_MARKETING_VERSION = 1.6.1
Merge branch 'release/1.6.1' into develop