Merge pull request #5006 from tianhe1986/develop_common

Fix two bugs with Common Functions 
1 file changed