Yes I agree, looks like this was branched off #879 so that one should be merged first anyway.