Feature #5641