Backport from 72X scramv1.
Merge pull request #854 from degano/scramv1_62X_stable

Backport from 72X scramv1.