Merge branch 'rb/hpe'