Version 3.56 and clean up

Change-Id: Ia13467a2dbeb7062e17d8fce2e2521bf029865e6