New 6/17/2021 - added for SWEs 006 and 087