Bug #9151 and Task #9179