fix/STOR-459