Merge branch 'master' into siarhei_bandysik/classloading