Added feature 9 (#ref 1831)