Fix suggested to resolve FB40733.
Merge branch 'fb40733'