case 1508 - SFX entity_buttons compatibility.
case 1508 - SFX markup wrapper.
Merge remote-tracking branch 'origin/case-1508' into develop
Merge branch 'develop'
Release: v1.8
Merge branch 'master' into develop
Resolved merge conflict with PH libraries