May also depend on 1.6 development branch