VP-297: Refactored panels to use shared grade (not working properly due to FLUID-5048)