Merge "Shorten month on AOD date" into rvc-qpr-dev