Merge branch 'release' into develop
ADD: added legacy tracking adapter for FF6.8 and 6.9
Merge branch 'develop' into release