Integrate cpp fixture changes into develop