Merge "Stable branch for FDS"