BHV-10403: updated with review comments