Merge branch 'bing_issue#188_restructure_ambs' into develop

8 jobs for develop in 17 seconds (queued for 1 second)