Added v1.2.15
Resolved merge