apply review comments. refs f744431