Merge "Initialize two fields in constructor" into sc-dev