Merge "Revert "Block data call"" into main