Cra 505: Merge 14/08.