Merge "BUG-865: removed use of deprecated parseToClassName method."