Catalog down arrow dynamic steps
Merge remote-tracking branch 'origin/v3.5_catalogstep' into v4.0