bugfix on reg
Merge branch 'version_3_1' into version_3_2
solutions ordering and hints