Merge pull request #4532 from TeamAmaze/bugfix/4531