Merge. Note: changeset b048156543b6 (Fixed normal bug EXT - 5104) was initially commited into default branch by mistake --HG-- branch : product-engine
