Fix dependencies, add tag restriction support.
Merge remote-tracking branch 'github/dev' into dev