[Merge] Unstable OCT 5 MANTIS 5582