Draft: Merge M8 master to OSDU master
This MR is to merge M8 master to OSDU Master thereby moving the fixes made in m8 master alone back to the master branch.
This MR is to merge M8 master to OSDU Master thereby moving the fixes made in m8 master alone back to the master branch.