Commit by nithin george from rapid value solutions