[#8024] ticket:872 Cleanup
6 files changed