Bphy12 and BPHY18 fix
This merge request includes changes in BPHY12 and BPHY18. BPHY12: Changes have been made to match with share/BPHY12. Working on test AOD samples BPHY18: Some missing variables are added back
This merge request includes changes in BPHY12 and BPHY18. BPHY12: Changes have been made to match with share/BPHY12. Working on test AOD samples BPHY18: Some missing variables are added back