[TIDOC-1499] More fixes for due to multiple cases