apply master commit: 0bf266ff00311a86e7f4ea116c8927432a313482