Merge "Fix release file detection"