Merge "Split ConfiguredReadOnlyMode into own file"