City to initiate master plan for Columbia Point