[ASDK-2562] All components included and aligned