Merge branch '1845_code_cleanup'