SEA-110: Give up merging from 4.1 code - Forking code