DEVOPS-265: pre release small fixes