The S3 feature PR caused some static check issues after the merge, those are fixed now.
Co-authored-by: Alok Kumar <rajalokan@gmail.com>