43616-185 Bugfix
43616-185 Cleanup