Merging with changes of https://github.com/sympy/sympy/pull/12000/commits/185bb23a1cfaa4930b7ee8c08cfa82aa7d96aa73
Merging with changes of https://github.com/sympy/sympy/pull/12000/commits/185bb23a1cfaa4930b7ee8c08cfa82aa7d96aa73

kaushik94/sympy,kaushik94/sympy,kaushik94/sympy