Merge userengine from prev project