Updating to 1.3-2.5 with some minor logic fixes for rare use cases