Merge branch 'master' into sid_dev
Revert 404358d..fcee487

This rolls back to commit 404358dd0e754cccbfa08b48264946902524ca41.
Revert "Merge branch 'master' into sid_dev"

This reverts commit fcee487783c599cc05f4b0c289e50bce85e5d5f2.