IDEA artifact polishing

This change polishes up the IDEA artifacts a bit more.

[#60059670]
Merge 60059670-more-idea-changes to master

[#60059670]