[#1364] Resolved merge conflicts with `develop`.