Merge pull request #5876 from slava-sh/nova