AG|ST: merge latest toolkit changes to fork