reduce visibility of a method which is not required to be overriden by test
Merge branch 'issue824' into 1.7.x