Merge "Update stable branch testing"