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