Merge "Fix BAL via notification.publicVersion" into udc-dev