[#44528397] Update utils, move to commands in framework