Maint/master/cherry pick 1.3.2 pe commits