Merge "Added extservices in apex_available for Permission flags" into main