Clear stubs after Dictionary tests
Merge branch 'master' into pagination