Full compliment of misc wiki detections

Change-Id: Ia5894666cd3e7f68c7ab6f9a4319acc510aa4d75