merging shinglyu/servo/contentType = 6df9b7fd into auto