Merge "Fix the local matrix dirty flag when size is changed" into devel/master