Merge with master (after SIT-401)