Added changes from 1.4.6.0 version