Merge "Adding Reverie Changes"