Merge "[Catalyst] Improve observer mechanism for binding helper" into main