Merge branch 'sg/test-BUG'