Close #6504 #6510 and #6511
mentioned in issue #6504 (closed)
mentioned in issue #6510 (closed)
mentioned in issue #6511 (closed)