0004424: There should be possibility to extend same class more than one time in one module. Reverting some changes because of legacy modules support.
bug #5576: fixing poor GIF image quality (cherry picked from commit a55dad1)
typo, var name (cherry picked from commit 1d952b9)