Merge "Add overloaded API with activity options parameter" into rvc-dev