merge in srri branch to (2 behind master)
Merge branch 'srri-merge'