Rewrite, unregister Listener if unneeded, move stuff
Merge remote-tracking branch 'origin/master'