Development Merge

Merge from Development to include BDF bug fixes, handler scripts, error checks, etc.