Merge branch 'master' into smart_holder