new operations added
Merge commit '9af3dd9' into 6.x