Fix autoloader issues
Merge 'Schibsted-Tech-Polska/dev' into dev