This PR also reverts commit 2f9354b17e to bring back 8 byte block id requirement for azure gateway.
2f9354b17e