[OEM-136] - changed preferred firms limit from 5 to 6
Merge branch 'master' into rc/1.5-hotfix4