Merge "tweaks for forward compatibility"