Merge changes Ifaf5dd7d,Ib24df94c into devel/master