Merge "The shelf height was mistakenly provided as width, making it equal to 0." into tm-qpr-dev