Preliminary support for #507