EOL bugfix/15.2