nix circular dep
merge from dev
Merge branch 'master' into dev