GitLab

Created by: nirvanesque

Hello,

Please validate the following and merge to master.

• Corrections for bug ref 5941
• Updates+refinements to several unit tests

Please let me know if clarifications required.

Thanks in advance, Anirvan