Swapped to a different merge module
1.5.3
Merged
1.11.1