[Issue 010714000] Issue clean up