Merge from master
Empty methods