Merge "Fix issues #6103378 and #5959515."