- Resolves: #432433
- Resolves: #431609 - Single '%' signs appearing over the spec have been replaced with "%%" combo