Fixed merge with Desktop Summit work