CON-1709 | Opener's code review fixes