Merge "tweak for forward-compatibility"