base import of adapted files from v1.88