Work in progress on issue #459
Please do not review/comment yet.