#10596 finalising customers feedback