3.6.0 tested