Merge latest dev changes into general
Update dev and general executables. Both are identical