Merge "Update stable branch tests"