Merge "Enable the suggesiton test on disabled components" into main