Merge feature/ci-cd-optimization improvements
#4845
Merged
feature/ci-cd-optimization improvements
#4845