Merge changes from PROX-v041