merge cf origin master to x-plat_dev 

merge cf origin master to x-plat_dev