Merge "Tweak for forward-compatibility"