Merge release/4.1.2 into develop