[case 9488] Updated setup + behaviour