Merge "Update modules to allow empty impls" into main