add methods
add protected methods
to protected
Merge remote-tracking branch 'origin/1.4.1-to-private' into 1.4.1-wip