Revert "Merge remote-tracking branch 'pli/master’, skip some stuff not required"

This reverts commit e38c28edb37714b633ce3b09b091fc18287dc7d0.