Branched new dev tree from @gitbrew