Merge in master to Sass and force dimension config changes