Mantis #32 / #37 / #42 / #44