AI-621 - fixes
Merge remote-tracking branch 'origin/version4' into version4