Unreturnables changes on beta

Imran Hussainrequested to merge
master into beta

lets get these changes rolled out and + bug fixes

Merge request reports