Merge branch 'scaleapp-feature' into scaleapp-6.6.7

For the scaleapp feature, the original implementation was based on Mint 22.2 using tag 6.4.8 as the base. Mint 22.3 is already out, so this merges the patch forward to the 6.6.7 code base.

Author: Eric Wing