#12, backport geot-4497