Merge "Fixed deadlockLoop() IDE errors"