[BZ #3514, BZ #3515]