Part of #157 (closed)
Replaces !459 (closed)
Should not be merged into production before privatestorageops!363 has been deployed on production too.
production