Merge "Helpdesk frontend related fixes and general cleanup"