bugId:93888
bugId:94860
bugId:70353
bugId:70353
BugId:94922
bugId:93486
merge tomek_forum_cherry_on_the_cake