SOC-3141 | Investigate sometimes buid failed [unstable] problem
Merge branch 'feature/relooking'