Cherry picks from CB-2B1

Save Files
Samples Path
Depreciated Nodes
Installer patches