update as per latest main, resolve merge conflicts due to OMASA changes