#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.
And @kandeel :)

I'll look for others that may need adding too.