Fix for STOR-344.