[BZ #5441, BZ #5452, BZ #5454]