bug if pompeA is null
Merge master into remote-prod