Cherrypick of fixes done and working