sync with develop, resolve conflict, fix remarks in PR