Merge branch 'sv/submitting-final-patch'