- reverted accidentally removed methods due to merge with trunk