[tbnl-devel] Merged patches to Araneida (with one change)