Update the reference to smart_common
Merge branch 'dev'