merge all v3.55 patch changes into master org