Fix metadata and selector value, close #512
Merge remote-tracking branch 'origin/develop' into develop