BACKLOG-4302 : fixed commit merge