Merge branch 'master' into topic/fix_brapi_v2_test