Merged v2.41B
Merged v2.41C