update downstream branch with step-6 changes