Merge "SideFPS bp cancels on power press" into tm-qpr-dev