Cicd edge cases fixes

Merged Ткаченко Никита Андреевич requested to merge cicd into master Apr 10, 2024