merge updates from master version bump