BACKLOG-3628 : fix missing issues