C7339 c7304

only merge the last 5 commits please