Update from Master NS.

update on 9.11.14