XXX This patch will not work because push will needs the lock. So this will need some rework.
--HG-- branch : heptapod