Nutmeg-related changes

Pull changes for Nutmeg version and make sure it still works fine.

Edited by Alina Runova