Merge pull request #536 from bofferdn/sbe

Enable consecutive SBE updates in Rainier