Merge rc to master

#4319 with a resolved merge conflict

@rocha  did I resolve the merge conflict correctly?