Created this additional branch, as previous MR was based on outdated master and resolving conflicts was difficult due to the number of changes in main.js.
