LPS-36641 Copy from portal
LPS-36641 Make compatible
LPS-36641 Apply
Releng update: not a MP app
Fix bad releng