adjustments for power machine
Merge comflicts