Consumer qb 1 bugid 31765 2

In this branch are changes related to the ticket https://wikia.fogbugz.com/default.asp?31765