Merge updates from superobject project