Merge "Make sure we delete a gloabl instead of a weak global reference to the java data source" into main