Merge branch 'fix'
fix the master bugs
Merge branch 'fix' into xj