Merge "Fix Radio Selection and Undo JointJS changes"