Merge "moved object declarations from class level"