Updated build version to v3.0.14-development
Resolved merge conflicts