Merge "OOB generateLocalOobData" into sc-dev