Consolidate with current state of kirkstone-staging branch

This should bring in the last changes to make this code donation up to level with the old code base.