Merge "Change checkbox back to square" into rvc-dev