sug-281 restrict_value option fixed
sug-281 restrict_value option fixed (merge from 4.7)