WP-4393 adjust the identifier and remove contextual