Fixed issues for 12.26
Merge head issue and issue update