merged version 1.4.4