hotfix/roomtrading

Open username-removed-1441561 requested to merge hotfix/roomtrading into dev