These changes were made to herja while running the production server and are being saved to ensure no loss of data when moving forward
Potential fix for ATMO-503
Merged changes from production-herja to A-N