Merge "Tweaks for forward-compatibility"