Triggering build
Merge branch 'hotfix-4.2.1' into support-4.2