Cra 505

Merged Haavards updates