manual merge for nui 0.2.39