BACKLOG-4360 : fix bundle/key resolution