Error occured when coming from the mobile or Chrome extension search
Merge branch 'develop' into release/1.6_RC_2