[PPP-3241] DEV: Merge the code from the ENGOPS404 branches in Common UI
Merge pull request #220 from e-cuellar/master

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