Merge "use consistent method to generate constant value" into sc-dev