r1530 + done with dictionary layout (ticket:17) and words refcnt guard (ticket:46)