Merge "Chore: Fix bashate warnings"