relative to feature #5293 and bug #5357