v1.4.1 upgrade (part 2)