[PPP-3241] DEV: Merge the code from the ENGOPS404 branches in Common UI