--Yes for 5.5
--no for 5.5
Merge commit '369fe5abc8fa1411e2704f3fd3ce5d91c7dd8cee' into maintainence/5.5
ok merge to 62fb90d46af40b6755d64c92daee43ecaca03098(included)