MFC: following 4 commits: