issue #4559 : update for Scene samples