Merge "Refactoring model-impl.cpp" into devel/master