To rev b3d5a5514a27076c63844bde6d60703a7aea4adc Fixes #821 Change-Id: I3d492cd743a293ffa3e78a042ea28060c9840bb6