Merge commit 'cyr/hpa-list'