Few adjustments about v5.14

See comment on each commit...