Feature #6229