changes related to upcoming scout-local repo
Merge commit 'adebec4d4e974053c330bba3a36240c3b7fb6db5' into HEAD