Merge changes from 2.1.0- new entry point URL structure