[IMP] Multiple changes to AEMVC