merging in Zuluru commit through 1357 (f16a88ecbc)