Merge #17111 with fixes

Fix up lint in the AWESOME #17111 PR