Merge "Transfer uploadOnly flag to the core and update manager" into devel/master