Features #2953 #2860 #2807 #2787: Add entries to comp. guide