Merge branch 'version2', remote-tracking branch 'origin/version2' into version2
Merge branch 'version2', remote-tracking branch 'origin/version2' into version2
Merge branch 'version2', remote-tracking branch 'origin/version2' into version2
Added Doxygen comment