Dev commit from 12.4.14
  - Getting near release!