Change-Id: I0acb886d38a09b764cb3e324490a7c52b945d4fa Refs: #2564
Change-Id: I9351c669282c3c02fd533237489beeb10fe7d15e Refs: #2497