Refactoring
(cherry picked from commit 37e36f8)
(cherry picked from commit 0839f39)