Merge branch 'master' into test_for_1927

test for #1927