Merge "Multi-shade foundation - integration (5/5)." into udc-dev