Build enhancements for release + release 1.3.1