Merge branch 'master' into fix-reload
Merge branch 'fix-reload' into backend-getauth
fix test - changed result due to caching changes