Merging in Changes for Adding Read Only mode.