Merge PR #943, #928 and #944

#943, #928 and #944