Authored by hf

code review by hf: merge master code to develop

This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.