Merge "Make folder sizes customizable" into tm-qpr-dev