CMS-1152 All applications - General feedback element fixes