Merge "Handling frame references and scale factors in one for loop." into experimental