Cherrypick usefull commits from master