AI-518 - refactoring/cleanup
Merge remote-tracking branch 'origin/version3' into version3