[#34] Inline dev fix
Merge remote-tracking branch 'origin/master' into topic-Feature1