Fix: Resolve regression caused by concurrent merges of commits - ee34cbbd4956270051e5e5d46ba2b5d6522c1079 and bd4737592e481c03ce7393204fc160c6ab22ce90

Fix: Resolve regression caused by concurrent merges of commits - ee34cbbd4956270051e5e5d46ba2b5d6522c1079 and bd4737592e481c03ce7393204fc160c6ab22ce90 #316