Merge "Alternative workaround for using private attribute" into sc-dev