Merge mustache branch 'release/2.4.1' into repository