Merge functional changes into UI

Created by: ayubharis

Merge request reports

Loading