Merge "Add static for constant" into sc-dev