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