Merge remote-tracking branch 'remotes/amit/tags/vser-for-2.3-1' into staging