Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into sc-dev