Prepare for development on 1.21.2
Fix issue with certain option configurations breaking prefixes and suffixes