Incorporate review comments from r221742