added spirit specific commits

Change-Id: I682233eb0245d5afd5fec25d97eaa096795669b4
final fixes

Change-Id: I0419d6f04579822bec83c43bf9eb2b5e7c7600ec