Merge "Inject clock related components (2/3)" into main