SAMZA-319: Address release feedback