B2G CSA14 code integration : 72x

Same as PR #4784, but now integrating into 72x for forward compatibility.