This commit closes vso#4005