Merge "Fix script when CLEAN_DIB_IMAGES var is not set"