Re #6516 Turn APIv2 on by default