Merge branch 'ticket27247'