Merge commit '7cd692574b6056a602e3795160dec643a1b6cac2' into sqscripter