Diff fbida-2.14-r6 with a fbida-9999

Thank you!