Fixed #8017801167464 TASK COM COMMIT DO HE MAN