* commit 'a413551cf92254106a61aa024509dc9e5b72fdfe': Address API council comments on location mode API council