Merge branch 'feature-build-split-v2' into main

Change-Id: I9cc86751fd9ae7c4eeed7f15be4eefe82c26620b