Following Karsten's comment on !1585 (merged), the modifications fix the checking of APS constraints in multi layer context. The check is made per PU instead of AU.