Marc/ticket/11525 Part 2