Feature #6046