Merge latest master changes into feature branch for compatibility.