Include initial fix for AME-5261
Workaround for DOCS-247

Thanks to Chris Lee for this fix.
Initial fix for AME-5261