Issue/pup 3081/acceptance fixup