3.5.x acceptance test 3643

Ted - this is good to go now. Finally it works correctly. I'll forward port it to 3.6