Updated classpath changes
Merge origin/master