Merge "Merge "Add bug component " am: 1de335cecc" into main-16k