client enhancement for automation enable disable
Merge branch 'hotfix' into dev