Merge "TIF: Add sanitization code for the current position" into mnc-dev