This patch is based on @subimage's inputs in the related GitHub issue. Thanks again! Fix #8597
rake acceptance:boxes