[Delivers #44580621] Add support for 'Finishe(s|d)', and make case-insensitive
Merge branch '44580621-support-fixes'

* 44580621-support-fixes:
  [Delivers #44580621] Add support for 'Finishe(s|d)', and make case-insensitive