Update t.php merged braches

merge