DO-5868 changes made in reordering assignment