- Improved fix of MC-298464 (#524)