OC 8242 - azure fixes of some bugs / issues