Same changes that were made in the stbale branch ( FB_NOYPAN support )