[BACKLOG-197] Additional changes for BACKLOG-197