Dear God - don't throw exceptions in model methods
Acknowledge restricted_to
Merge remote-tracking branch 'upstream/2.3/develop' into 2.3/develop