(cherry picked from commit 0d00a94b139602d9280360dc2977dbc989c6ef1e) (cherry picked from commit 04abf4c0)