[sim]recommit id:e2f46ce868fec8c797545de851f91f78a85226a2

Signed-off-by: Jarko Poutiainen <Jarko.Poutiainen@oss.tieto.com>
Merge pull request #129 from jpoutiai/next

[sim]recommit id:e2f46ce868fec8c797545de851f91f78a85226a2