Merge branch 'agarciad/578847' (fixes #578847)