Bacon test

i fucking hate you.
This is a merge of CM-STABLE source code into PA source for bacon.