#184 Review PR

This PR is created for initial reviewing of the changes of #184 because #184 includes many external changes and hard to review.
These branch settings will need to change before merge. Just mark as a todo.