Change-Id: I9351c669282c3c02fd533237489beeb10fe7d15e Refs: #2497
Change-Id: Ib17ea05592445cf99af9726ef7799ead813ca0fe Refs: #2489