Merge "Mark constructor as static" into sc-dev