Merge "Change of check flag (supports newer systems)"