Initial vendor branch based on 20141023-r20812