=BG= merge guard from branch
Merge branch 'master' into api-interface