Merge "Fixing minor bugs (5085316, 5082963, 5042828)"