Resolve "Sync code with changes made #327" Closes #27 See merge request grp-fidentis/analyst-webapp!45