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