Main trunk update from the "lace" branch.