WIP #93769 and #93722.
Merge pull request #43 from luisromangz/93769-93722-AtmosphereProviderWIPWithMarkers

WIP #93769 and #93722.