Transfer modifications from master to jl_gurs to keep it up-to-date
mentioned in commit 7e44b110
merged