Update branch from master and solve conflicts

1 job for develop-RainFARMCase
in 36 seconds, using 0 compute credits, and was queued for 2 seconds