Merge changes I39bfefee,I47795987,I70d120fb,I58cc5e01,I96bee7b9