bug#1844 related changes