Merge pull request #3627 from ryzhovau/opentracker-conf