Merge branch 'spahan' into spahan-merge