Issue #567, #568 completed