Based on PR#2411