Merge "Rollback to Version 3.30.33 (based on 6bee6dcebc3033d4665a8069020302ce5018522d)"