manually merged https://github.com/dnnsoftware/Dnn.Platform/pull/104