Throw exception for invalid restriction (support info)
Merge remote-tracking branch 'upstream/master'