Port watcher/hd_user tables + file api support + some previous 2.X improvement - it is a massive mix of many commits from Jon Doane/David Zaharee/Jerome Mouneyrac