Rebase onto Sid's code and latest iccProvider. Add refresh tag support.
WIP