sync with develop
remove reference &
@var -> @protected (change only comments)