Merge changes to Employment tab and Exam tab workflows