merged to ST3 version