Resolved merge conflicts on commit ca0cff0627b4dfc0dc6207cc24e2478ec471e558