Merge "Make constructor and at_exit handler non-static" into sc-dev