issue #19550: add more read only handling logic