Merge pull request #3246 from agh1/empowered-by