update 3.5.5-demo to 3.5.5-current