Feature/tj patches for 0.9.12