Merge branch 'tg/next/0.4_add_myspass' into next