Front-end: pull request #2366