Performance improvements and override mandatory to optional rules

Change-Id: Id099f1f03443fafce2f2181e305fbababbe0fa1f
5 files changed