Merge commit '9cc074a50558c7cc11aa677861cbb5747ab6bf6b'
edge staging cap configuring
Merge commit '320d9dc5557de71f2812a68f01b8df33f81e085b' into edge