Commit the changes from issue #5240.