Merge branch '5.1.1-dev' into 'Release-5'

merge 5.1.1-dev into Release-5

See merge request !25