Merge branch 'rs/apply-avoid-over-reading'