Fixed warnings with matrices
Merge branch 'release/0.33'