Fix for ACT-1826
Merge remote-tracking branch 'upstream/master'