MFC: following 2 commits: