#1821. Alternative branch for MEDUSA optimisations since previous attempt failed due to huge and insurmountable clashes with GO6 "package" branch.