DOC-2900 Apply feedbacks