WIP: Issue resolution

Change-Id: Icb7e069bafb1ec0d4c8f891725a8c0f8f5463948