Mantis 6297, 6307: Changes from Mantis 5258 are back in