Pull changes from 1-3-stable into 2-1-stable