Merge #2352341, continue.