fix
Merge branch 't306_live' into testing