Merge branch 'sh/kfr2r09'