integrate devices
Merge remote-tracking branch 'origin/develop' into develop
list grid as a share
Merge remote-tracking branch 'origin/develop' into develop
fix issues