#9349 #9350 in mantis