Resource autoload
Merge with main
Merge with main