Merge "initial hce configuration"