[DF-1359] Cherry-picked commit from development
[DF-1359] Removed false from return instruction
[DF-1359] Cherry-picked commit from development