Merge branch 'update-with-latest-changes' into 'master'

Update with latest changes(GONRG-1610 & GONRG-1638 & GONRG-1734)

See merge request !2
4 jobs for release/0.5 in 11 minutes and 6 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Build
passed compile-and-unit-test #209532
osdu-medium

00:06:39

 
  Scan
passed gemnasium-maven-dependency_scanning #209533
osdu-large

00:01:28

passed license_scanning #209535
osdu-medium

00:02:42

passed spotbugs-sast #209534
osdu-large

00:04:23