Closed #6215, #6302