Merge "Merge tag 'v1.5.19' into dev" into dev