Master Changes

Merging master changes back into devel to be synced