Merge branch 'pr/1393'