Integrate proposed changes to :ref: