Merge "Added custom bp size." into tm-qpr-dev