[#61123372] Move task step earlier