Today
merge glass_fix_resourcerefs to main