DF#QCADOOMES-2307 fix state change
DF#QCADOOMES-2312
CM update help.properties
CM merge hotfix/update_help_links --> dev (malually resolved conflicts)