Merge changes from JDQ39/E & some other fixes

Change-Id: I9a5caa2a83c9890e9a5a4b267b48ca4f48efe0f0