Jira Issues Fixed REDBOX234, REDBOX-236