Merge "Added limitations for attributions to handle invalid cases" into main