Update product version
Fix merge conflict
Merge
Merge branch 'master' into stable
Merge branch 'dev' into stable
Merge branch 'dev' into stable
Merge branch 'dev' into stable
Merge branch 'dev' into stable
Fix missing matrix handshake API
Fix clashing API name
Add BIT_MAX_BUFFER definition
Merge
Repair mpr.h