code optimization and consolidation
release id 84656101da