Merge "Use bool1 instead of isEnabled" into main