merge in PoS fixes