Merge branch 'develop' into '302-external-files'

# Conflicts:
#   cmake_modules/CodeCoverage.cmake
#   cmake_modules/grpc-config.cmake