d088740 merge f24 branch

Merged and Committed by Alex Kashchenko 7 years ago
    merge f24 branch