[3.8] Refactor configuration check