Merge "Fixing failing focus tests"