Merge "Fix build due to missing abstract method impl" into nyc-dev