Few fixes related to !5843 (merged) that can be merged independently.
This could be merged for the 2.0