Backport from 72X scramv1.
Merge pull request #855 from degano/scramv1_62X_devel

Backport from 72X scramv1.