Draft: Minor strategy fixes

Nikolay Kuznetsov requested to merge kuznetsov_n/try_full_pipeline_with_strategy into dev Sep 14, 2024