Improve spec.
Turn owned_by back into a class method
Merge branch 'GR-70__improve_security_model'