add a test wrt #570 in master
Merge fix for #570 in master (2.5)