Merge branch 'hotfix/4818'

Close #4818
Fixes #4817
Make methods setUp and tearDown protected
Merge branch 'hotfix/4783' into develop

Forward port #4783