Feature #7135