AI-619 - bugfix and moved to separate package
Merge remote-tracking branch 'origin/version4' into version4