merge master with piko

fix disconnected branch