Merge branch 'inex-live'
Update change log