Merge branch 'fk/usage'