This MR is combination of !71 for #3581310 and !55 for #3511614 to prove that after merging both the pipeline should be green.