Updates for K3-Core canns branch merge
Merging and updating for K3-Core canns.