Merge "Integrate the promise package"