Merge remote-tracking branch 'smcv/comments-metadata'