[0.9.5-dev] update to 0.9.5 & and start working on new container wrapper