Resolve merge conflit release/4.2.4 in dev