[[ Bug 12891 ]] Make sure we use 1.5 version class files.
Merge branch 'bugfix-12891' into develop