Synch to developer's version: Should fix a lot of instability issues