JAL-1159 Merging 2.8.1 patches and Anne Menards work from 2012 into development branch