devel-share merge into sasha