ticket bug fixes
merge