CC-5289: Exception about linked show in zendphp.log
CC-5283: Calendar gets messy, possibly after upgrade
Deleting show code improvement.
Merge branch '2.4.x' into 2.4.x-saas