New bug fixed.
Revert "New bug fixed."

This reverts commit abfd103ff88c42a71ab2707a9592a931b461c14a.
Merge branch 'master' into T
TODO updated