Merging back to HEAD branch oacs-5-8 (using tag vg-merge-oacs-5-8-from-20141027).