added validation rules; bugId:94781
templating for wikiaspicks; bugId:45483
manually merged local branch bugid-68505 to dev