Merged revision(s) 137-157 from it/trunk: