UPDATE: Fixes from WPAS – Dev Notes – 13.10.21