(cherry picked from commit 15fb05fe81765f7102870669726a908be8016cb9)
(cherry picked from commit 9c11b6bd5073b8bfc85bcdc263f860d74e44c10b)