main/ell: upgrade to 0.21
cherry-pick fix-out-of-bounds-access from development branch cherry-pick T1-timeout-crash from development branch
cherry-pick fix-out-of-bounds-access from development branch cherry-pick T1-timeout-crash from development branch