Merge "Fix issue with bitmap uploading"