Issue-158-EC-feat