Merge "Introduce dependency checking" into main