Merged from develop Branch. Getting ready for Bolt 1.3 Alpha release.