Manual merge of the last commit in *test branch