Merge "Tightening app component alias"