Converted develop to new BaseKit Baseplate v1.0