Merge "TIF: use integer for constants instead of string" into oc-dev