More work for fix/STOR-459