Merge pull request #3330 from madewokherd/compactframework