GE-11 Procedure call
Code refactoring
Merge remote-tracking branch 'origin/dev' into dev