[AE-727] apply new commit 2a8117a994c1a86199bd0610ce9a784311b2596d for branch 1.1