b6 second sim
Merge branch 'b6' of https://github.com/romio-sj/test_sjr into b6