Fixes for currency conversion issues from develop branch