Merge changes I24cdcd3a,I4132e7a7 into main

* changes:
  Remove legacy layer mirroring
  Remove legacy layer hierarchy