Merge "step 2 towards backwards compatability"