Merge remote-tracking branch 'cfabianski/permitted-to-model-should-ac