Update master

Update missing implementation to the master release