Merge remote-tracking branches 'regulator/fix/constrain' and 'regulator/fix/defer...