Merge branch 'gp/add-u-A-documentation' into next