Merge "Move policy handling into ATM hierarchy [3/n]"