Merge remote-tracking branch 'teor/ticket27757'