FEND-849 post code-review changes