Last changes on A8 and old changes on A6 that Id forgotten to commit.