#16, Porting GEOT-4540