Merge "Merge commit 'b64fc87828da4d00c389a381c69d4e13f1f64425' into HEAD" into private_nbr_134