Merge branch 'master' into dynamic_procedure_library