Update master to use OIPA V2.1 API (V3) calls