Merge "Enable annotations for framework stubs" into rvc-dev