Commit Before Prod cluster test
Updates for issues in prod cluster test