Committing the code after making the code some user friendly
Merge branch 'master' of https://github.com/opengeospatial/ets-19139