Some improvements have been made relating to #3492.
Some improvements have been made relating to #3492.