Merge latest Cra 505 to master