Trus 7-trusty branch to master