Merge branch 'develop' into bugfix-13270
[[ Bug 13270 ]] Make sure appropriate module methods are available for iOS device builds.
Merge branch 'bugfix-13270' into develop