merging consolidation changes from master