Merge pull request #4247 from opheliagame/feature/#4148