Fixes macro property saving issue in repo
fixes macro property saving issue in editor (to ensure the alias/key can be changed)
Merge branch '7.1.4' into colorpicker-toggle