merged recent-work branch