Merge "Corrections to processing abioverride flag" into nyc-dev