Merge branch 'release/v1.0.14' into develop
Add custom merge function
Bump version
Merge branch 'release/v1.0.15'