ACT-1709 fix
Fix for ACT-1672
Fix for ACT-1704
Merge with master