Feature #6308