APD-336: post review refinements