Sync with gitlab & fix parameter

This adds in some updates that have only been in GitLab and also fixes a parameter bug.