C3 salma fg s07 mergeable

@adamggg Please review