[IMP] Add feature #2 in the description
Merge branch 'issue/2' into 7.0