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