In comination with commit 9af31a27, Closes #14