merge function #00123 to master

please check