Merge from 7.1 to 7.2

Merge: no
Change-Id: Ibfe17c35ec72985823389c75a5c3135998443068