merge last plomino updates