Users should be happy.
Merge branch '1.0/hotfix/dft-make-users-happy'