refactor comment
sync with develop