Merge branch 'ar/t4150-am-scissors-test-fix'