SSP-1224 Add missing external.apply.natural.keys checks