final test after 3.5.x merge