Merge "Rename and move stub defaults to modules/common"