Merge release/4.1.3 into master