CSPACE-5877: Fixing some of the App layer dependency issues.