DAR-1405 Fixing lines from wrong merge