Merge branch 'release/v2.0.8' into develop
Fix sanitize_agi_data
Merge branch 'develop'