ERGO-K860

Pangea temporary hotfixes here

SPECS & DETAILS