wip/py-model-builder/patches
