protected methods
Merge origin/master