Merge optimization into development