Fix the build on Release
Merge branch 'rxui5-master' into bitmaps