Issue #3219, some initial framework