Created by: harrisonliu5
What type of PR is this? /kind bug
What this PR does / why we need it:
Which issue(s) this PR fixes:
14a246d3 Fixes #2378
f0abfeda Fixes #2379
943be41f Fixes #2361