Adopted changes of 0.1.55