Dev tools master based

Pull to get list formatting changes incorporated into this branch.