CRM-13973-qa : fixed for points mentioned in #comment-58264