By rblanker: Fixing missing code + fixing wrong merge from previous commit.
Version 3.2.4. build 1908.