Merge "Add resources for shell/shared" into main