Merged codelistmanager branch changes