Merge "1.7.1 release for APPC"