5.4.2 (17658)
Merge commit '3276a0d0ec9557477ed28899122affbc17c7879b' into ptr