Merge "Move to new read only flag" into main