Fix task #9568 and #9626