hq merge with trivial 2r-s modifications.