Update test branch

Pull vincentlab: develop into new test branch