Fixed some bugs.
Merge remote-tracking branch 'origin/develop'
Modified matrix merge.