Merge branch 'hotfix/v0.55'
Updated keys and values to match latest changes
Merge branch 'hotfix/v0.61' into develop