Merged changes from Yertle