Rebase records_models_draft branch

A rebased branch based on master