Merge branch 'dev-gtest' into dev