stable before remodelling merge
stable before remodelling merge