Update Active tree to master