Merge Devel (PID fixes & code refactoring)