Integrate changes from raph