Merge OHAI-551 latest + specs to 7-stable