Feature/frontend fix arrow

Merged Prakhar Dayal requested to merge feature/frontend_fix_arrow into develop

Merge request reports