Merge branch 'update-mixed-type' of github.com:shinde-rahul/mautic into update-mixed-type