Maint/master/cherry pick pe acceptance test commits