Merge "Update Feature Project page"