Support of 1.4
merge
corrected specs after merge