Merge "Limit framework module api packages" into rvc-dev