Issue #3489678 by dieterholvoet, larowlan: Provide an upgrade path to the permissions provided by core