merged CaaS + SmartCom v0.9.4