Interim work on Issue #349