master
8187443: Forest Consolidation: Move files to unified layout
8236111: narrow allowSmartActionArgs disabling