commit for mantis: 0002729