Allow check_graphic to be more flexible
#4370
Merged
check_graphic to be more flexible
#4370