Merge souce-cleanup branch into trunk Author: kim <kim@3cdefd35-fc62-479d-8e8d-bae585ffb9ca> Author: kim <kim@3cdefd35-fc62-479d-8e8d-bae585ffb9ca> Author: kim <kim@3cdefd35-fc62-479d-8e8d-bae585ffb9ca> Author: kim <kim@3cdefd35-fc62-479d-8e8d-bae585ffb9ca>