AC:  Added support for icon
Merge remote-tracking branch 'origin/3.2.12.01' into 3.2.12.01