Integrate changes from PR