[#62006366] finish task fixes