Fixed/Postponed in 9233d00