ROBE-116 Refactor
Merge remote-tracking branch 'origin/master'