Merge remote-tracking branches 'regulator/topic/can-change', 'regulator/topic/constra...