Merge "Revise the  javadoc and rename the constant" into rvc-dev