Clean up code [ComponentStatus]
Merge branch 'master' into test