Merge "Reduced Cyclomatic Complexity of pixel-manipulation functions" into devel...