Added GUI to choose collection method + task supports chosen method.
Merge remote-tracking branch 'refs/remotes/origin/master'