adapted this to 3.5.0 next step test again with 3.6.0