Merge commit '84110515b93' into devel/c++-modules