EOL bugfix/9.3