Merge "Revert "Add header for forward compatibility"" into jb-dev