Merged branch dev into enhancement/set_dlr_format_to_default.

3 jobs for enhancement/set_dlr_format_to_default in 24 minutes and 54 seconds (queued for 12 minutes and 10 seconds)