Squashing a few commits and continuing work
on merging the 12 api docs that have not
been ported to CE yet.