Merge "Fix issue where AOD would not start" into rvc-dev