Merge branch 'net-ll_temac-cleanup-for-clearing-static-warnings'