Merge remote-tracking takos branch