Commits from master at jtalks-org/functional-tests